; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 19:24:52 +0000 (12:24 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 19 Mar 2017 19:24:52 +0000 (12:24 -0700)
The following commits were skipped:

fdef18c Revert "Add DNS keywords and remove duplications"
1cb9aa5 Add DNS keywords and remove duplications


Trivial merge